From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 9 Aug 2011 22:13:57 +0000 (-0400)
Subject: Merge from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2618
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5fb2246ca81d1132d70b02e503e2297b471d64c0;p=emacs.git

Merge from emacs-23 branch
---

5fb2246ca81d1132d70b02e503e2297b471d64c0